Remove workarounds for mutual imports problems

Now that gjs Bug #558741 is fixed, we can import Main directly from
the toplevel of overlay.js/panel.js without causing problems.

svn path=/trunk/; revision=41

diff --git a/js/ui/overlay.js b/js/ui/overlay.js
index 1e744d11f81ef402100043c8aa00dc939bf7b994..4427ae7ab03a1022b8489e088485d0796014d632 100644 (file)
--- a/js/ui/overlay.js
+++ b/js/ui/overlay.js
@@ -5,6 +5,7 @@ const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const Tweener = imports.tweener.tweener;
 
+const Main = imports.ui.main;
 const Panel = imports.ui.panel;
 
 const OVERLAY_BACKGROUND_COLOR = new Clutter.Color();
@@ -228,7 +229,6 @@ Overlay.prototype = {
     },
 
     _deactivate : function() {
-       let Main = imports.ui.main;
        Main.hide_overlay();
     }
 };

diff --git a/js/ui/panel.js b/js/ui/panel.js
index f702a7c1ddf274084c15c206272feaf8d9147e87..3216746d0dcbf01b92f8f74f47fbb9f87f0a0a91 100644 (file)
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -5,10 +5,7 @@ const Mainloop = imports.mainloop;
 const Shell = imports.gi.Shell;
 const Clutter = imports.gi.Clutter;
 
-// The mutual import here causes things to break in weird ways,
-//  (http://bugzilla.gnome.org/show_bug.cgi?id=558741)
-// So we do a local import below
-// const Main = imports.ui.main;
+const Main = imports.ui.main;
 
 const PANEL_HEIGHT = 32;
 const PANEL_BACKGROUND_COLOR = new Clutter.Color();
@@ -46,9 +43,6 @@ Panel.prototype = {
 
        message.connect('button-press-event',
            function(o, event) {
-               // See comment above
-               let Main = imports.ui.main;
-
                if (Main.overlay.visible)
                    Main.hide_overlay();
                else